appDisplay: Consider admin defined folders before creating default ones

The system administrator might have defined some default folders system
wide via dconf default values, so checking for user defined values is
not enough. This restores the condition to also skip creating default
ones if the value is not empty. It still skips the creation of default
folders if the empty value was the result of a user action to allow
users deleting all folders.

Fixes: b0d396c82 ("appDisplay: Only create default folders on the first start")
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/9062
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/4087>
(cherry picked from commit 4b1d80383c84e2eb12a458c7a41f672d5feb2dfc)

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 71cc36af3aab3162be57109daef913aa39e27089..9e33cbd610800afc7f4d3ef439888e996cd5737f 100644 (file)
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1403,7 +1403,8 @@ class AppDisplay extends BaseAppView {
     }
 
     _ensureDefaultFolders() {
-        if (this._folderSettings.get_user_value('folder-children') !== null)
+        if (this._folderSettings.get_user_value('folder-children') !== null ||
+            this._folderSettings.get_strv('folder-children').length > 0)
             return;
 
         const appSys = Shell.AppSystem.get_default();